merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Wed, 20 Jun 2007 18:49:27 +0000 (12:49 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Wed, 20 Jun 2007 18:49:27 +0000 (12:49 -0600)
commit4f27e3fe03e2278c2212652e208f4c82ee880904
treef1ebe1fd45bc23f63e5245d098725e4bd9c516c1
parentb76c71e050472d5fa54e89b34350f977dea2f4fa
parent340643863ba2e9d1d93f17880f5f16317974c5e6
merge with xen-unstable.hg